Unequip Items/Masks from C-Buttons #1429

OtherBlue · 2026-01-02T00:29:13Z

null

Build Artifacts

…harkinian into unequip-c-items

mckinlee

Great job on this. I did not experience any issues in my testing. Codewise you are looking good, but the new VBs in GameInteractor_VanillaBehavior.h need to be moved above VB_KALEIDO_UNPAUSE_CLOSE to maintain alphabetical order.

OtherBlue · 2026-01-02T20:01:49Z

Great job on this. I did not experience any issues in my testing. Codewise you are looking good, but the new VBs in GameInteractor_VanillaBehavior.h need to be moved above VB_KALEIDO_UNPAUSE_CLOSE to maintain alphabetical order.

done

Eblo

Works nicely. My concerns are primarily with code flow and some tidying up.

Eblo · 2026-01-02T02:05:04Z

mm/2s2h/Enhancements/Equipment/ItemUnequip.cpp

+
+void RegisterDpadPageSwitchPrevention() {
+    COND_VB_SHOULD(VB_KALEIDO_SWITCH_PAGE_WITH_DPAD, CVarGetInteger("gEnhancements.Dpad.DpadEquips", 0), {
+        PlayState* play = va_arg(args, PlayState*);


The globally available gPlayState should give you what you need instead of having to pass a PlayState* arg, or is there a reason you had to do it this way?

Eblo · 2026-01-02T02:08:24Z

mm/2s2h/Enhancements/Equipment/ItemUnequip.cpp

+
+void RegisterItemUnequip() {
+    COND_VB_SHOULD(VB_KALEIDO_EQUIP_ITEM_TO_BUTTON, CVAR, {
+        PlayState* play = va_arg(args, PlayState*);


Eblo · 2026-01-02T02:11:39Z

mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c

+
    } else if (pauseCtx->equipTargetCBtn == PAUSE_EQUIP_D_DOWN) {
+


Suggested change

} else if (pauseCtx->equipTargetCBtn == PAUSE_EQUIP_D_DOWN) {

} else if (pauseCtx->equipTargetCBtn == PAUSE_EQUIP_D_DOWN) {

Eblo · 2026-01-02T02:11:45Z

mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c

        DPAD_SLOT_EQUIP(0, EQUIP_SLOT_D_DOWN) = pauseCtx->equipTargetSlot;
        Interface_Dpad_LoadItemIconImpl(play, EQUIP_SLOT_D_DOWN);
    } else if (pauseCtx->equipTargetCBtn == PAUSE_EQUIP_D_UP) {
+


Suggested change

Eblo · 2026-01-02T02:12:04Z

mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_mask.c

                    }
                    // #endregion

+                    // Item unequip enhancement


Suggested change

// Item unequip enhancement

Eblo · 2026-01-05T19:27:53Z

mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c

        DPAD_SLOT_EQUIP(0, EQUIP_SLOT_D_DOWN) = pauseCtx->equipTargetSlot;
        Interface_Dpad_LoadItemIconImpl(play, EQUIP_SLOT_D_DOWN);
    } else if (pauseCtx->equipTargetCBtn == PAUSE_EQUIP_D_UP) {
+


Suggested change

mm/2s2h/Enhancements/Equipment/ItemUnequip.cpp

Eblo · 2026-01-07T01:39:58Z

mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c

-                                return;
-                            }
-                            pauseCtx->equipTargetCBtn = PAUSE_EQUIP_D_UP;
+                    else if (CVarGetInteger("gEnhancements.Dpad.DpadEquips", 0) &&


I'm having trouble understanding why if (CVarGetInteger("gEnhancements.Dpad.DpadEquips", 0) was moved from being one overarching condition with further nested conditions, to being an AND condition for every case.

this is from when I was troubleshooting to try and understand why the enhancement didn't wanna work with the dpad and I thought I removed it but ig not????

Eblo · 2026-01-07T01:41:15Z

mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c

+                    // #endregion
+
+                    // #region 2S2H [Enhancement]
+                    // Item unequip enhancement


This comment tag is mostly for inline changes to source code. VB names are self-explanatory, plus this entire DPad input region already labeled as such.

Suggested change

// #endregion

// #region 2S2H [Enhancement]

// Item unequip enhancement

Eblo · 2026-01-07T01:43:11Z

mm/2s2h/Enhancements/Equipment/ItemUnequip.cpp

+#define CVAR CVarGetInteger(CVAR_NAME, 0)
+
+void RegisterDpadPageSwitchPrevention() {
+    COND_VB_SHOULD(VB_KALEIDO_SWITCH_PAGE_WITH_DPAD, CVarGetInteger("gEnhancements.Dpad.DpadEquips", 0), {


Could you go ahead and follow the same pattern you did with ItemUnequip? Just so we're not repeating one name and not the other. CVAR_DPAD_EQUIPS is probably as good a name as any.

improved code flow in general and undid unnecessary edit to dpad equips

OtherBlue · 2026-01-07T15:25:50Z

something broke, will check in a bit

OtherBlue · 2026-01-07T15:43:06Z

found what it was, just didn't update the GameInteractor_Should calls

OtherBlue · 2026-01-07T16:05:50Z

done

mckinlee

Based on changes that addressed Eblo's feedback I have one small change request.

mm/2s2h/GameInteractor/GameInteractor_VanillaBehavior.h

mckinlee

Did some sanity testing. Still works like a charm. I did notice a potential UX concern, but I don't think that's blocking. If a magic arrow is equipped, you cannot unequip it on the ITEM_BOW slot. It requires using the applicable magic item slot only. If you choose to address that, I'll re-review, but I'm approving as is.

OtherBlue · 2026-01-07T16:31:33Z

do you mean to be able to unequip any bow + magic arrow from the bow item? I didn't even think about that possibility tbh... would it be preferable to have it work like that?

mckinlee · 2026-01-07T16:40:51Z

do you mean to be able to unequip any bow + magic arrow from the bow item? I didn't even think about that possibility tbh... would it be preferable to have it work like that?

You know how when you have a item equipped to C/D it draws that white border around the item in the pause menu as a indicator? When you equip a magic arrow, that border is drawn over the ITEM_BOW slot, not specifically the magic arrow slot thats equipped. So my instinct as a player was to try to unequip it using that particular slot. I had gotten use to seeing the white border as a indicator for what can be unequipped for all other items. I hope that makes sense. I'd love to hear other opinions on this, but my first thought was to keep what you have as-is, but additionally allow unequipping the magic arrow with the regular bow slot.

OtherBlue · 2026-01-07T17:04:45Z

that does make sense tbh
yeah I can add it

OtherBlue · 2026-01-07T17:54:33Z

ok... I think that's everything

mckinlee

Thank you! LGTM.

Eblo

Looking cleaner now! One final nitpick, but if you can address my two standing cleanup feedback suggestions, I think this will be good to go. Mostly just to reduce the source footprint a little more.

mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c

* Bg_Danpei_Movebg OK * Cleanup * PR comments * Couple small things * Address the nit * Flags --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

OtherBlue added 5 commits December 31, 2025 22:57

v0.1

accdec7

Merge branch 'unequip-c-items' of https://github.com/OtherBlue/2ship2…

9cb98f5

…harkinian into unequip-c-items

works on all items and all buttons

927a760

mask support

1f460ca

clang format my worst enemy

03a7d8e

mckinlee suggested changes Jan 2, 2026

View reviewed changes

update keeping VB's alphabetical

ae62d41

mckinlee approved these changes Jan 2, 2026

View reviewed changes

Merge branch 'HarbourMasters:develop' into unequip-c-items

038e5ac

Eblo reviewed Jan 7, 2026

View reviewed changes

OtherBlue added 3 commits January 7, 2026 11:44

Merge branch 'HarbourMasters:develop' into unequip-c-items

f474d75

addressing feedback

51f5b3c

improved code flow in general and undid unnecessary edit to dpad equips

claaang formaaat

0a11dbc

OtherBlue marked this pull request as draft January 7, 2026 15:25

fix GameInteractor_Should calls

254fa8e

OtherBlue marked this pull request as ready for review January 7, 2026 15:50

mckinlee suggested changes Jan 7, 2026

View reviewed changes

mm/2s2h/GameInteractor/GameInteractor_VanillaBehavior.h Outdated Show resolved Hide resolved

Update GameInteractor_VanillaBehavior.h

f221450

mckinlee approved these changes Jan 7, 2026

View reviewed changes

allow unequipping magic arrows from bow item

7f57bc1

mckinlee approved these changes Jan 7, 2026

View reviewed changes

Eblo requested changes Jan 8, 2026

View reviewed changes

mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c Outdated Show resolved Hide resolved

cleanup

43ed640

Eblo approved these changes Jan 8, 2026

View reviewed changes

Eblo merged commit 0ebb3c8 into HarbourMasters:develop Jan 9, 2026
5 checks passed

OtherBlue deleted the unequip-c-items branch January 10, 2026 13:38


		} else if (pauseCtx->equipTargetCBtn == PAUSE_EQUIP_D_DOWN) {

Unequip Items/Masks from C-Buttons #1429

Unequip Items/Masks from C-Buttons #1429

Uh oh!

Conversation

OtherBlue commented Jan 2, 2026 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Build Artifacts

Uh oh!

mckinlee left a comment

Choose a reason for hiding this comment

Uh oh!

OtherBlue commented Jan 2, 2026

Uh oh!

Eblo left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

OtherBlue commented Jan 7, 2026

Uh oh!

OtherBlue commented Jan 7, 2026

Uh oh!

OtherBlue commented Jan 7, 2026

Uh oh!

mckinlee left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mckinlee left a comment

Choose a reason for hiding this comment

Uh oh!

OtherBlue commented Jan 7, 2026

Uh oh!

mckinlee commented Jan 7, 2026

Uh oh!

OtherBlue commented Jan 7, 2026

Uh oh!

OtherBlue commented Jan 7, 2026

Uh oh!

mckinlee left a comment

Choose a reason for hiding this comment

Uh oh!

Eblo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

OtherBlue commented Jan 2, 2026 •

edited by github-actions bot

Loading